-
Notifications
You must be signed in to change notification settings - Fork 55
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Проверка #235
Проверка #235
Conversation
Added Devicenetwork component to ensure the screens work
* Ensure Arrivals Blacklist in Bluespace Locker rule * While I'm at it, stop the QSI too * fix thing I broke somehow * Every bluespace locker arrivals blacklisted * Add ArrivalsBlacklist to the prototypes too
* Fix popup on handcuffing for person being handcuffed * wrap onto newlines to appease the style gods
…pes. Added default engineering sprites for atmos computer boards. (#34078) * Defined sprites for Atmospheric Alerts and Monitoring computer boards. Added research unlocks and lathe recipes for them. * Defined default engineering sprite for atmospherics computer boards. Removed Power Monitoring Computer board from research and lathe recipes. * Defined engineering sprite for atmos computer boards. Removed Power Monitoring Computer board from research and lathe recipes.
…ame person (#33704) * Deduplicate traitor objectives * Remove redundant check
Removes Unneeded File
* Initial commit * Minor update
Co-authored-by: PJBot <[email protected]>
* Added support so that smile can use hats Changed Prototypes/Entities/Mobs/NPCs/pets.yml Added smile_inventory_template.yml in Resources/Prototypes/inventoryTemplates Added dir smile_displacement.rsi inside Resources/Textures/Mobs/Pets/smile.rsi Added smile_displacement.rsi/meta.json Added smile_displacement.rsi/head.png * Fixed sprite path in ProtoTypes/Entities/Mobs/NPCs/pets.yml mapping to wrong smile_displacement.rsi Fixed smile_inventory_template.yml using uiWindowPos as 1,2 instead of 0,1 Moved Resources/Textures/Mobs/Pets/smile.rsi/ to .../Pets/smile/smile.rsi/ Moved Resources/Textures/Mobs/Pets/smile.rsi/smile_displacement.rsi to .../Pets/smile/smile_displacement.rsi * Minor fixes: removing comments and change naming Renamed Resources/Textures/Mobs/Pets/smile/smile.rsi To .../Mobs/Pets/Smile/smile.rsi * Removed smile_inventory_template.yml and used head_inventory_template.yml instead
* add guaranteed cotton pizza to pizza crates * saner parenting * Use clearer suffix on cotton pizza box
…ds for moffs (#33508) * A looooooooot of new cotton foods for the moffs * address slam's comments on the food for moffs not having any moff food in the food (the food that's intended for moffs) * alternative sprites for bagel-cottondough.png, baguette-cotton.png, and croissant-cotton.png * update requested sprites * change requested sprites * address part of sloth's review, awaiting response * address second half of review, fix magical food nutriment mitosis bug
* Remove filters from joint crafting * err * hmmm * guhhh * yyyy * whitespace --------- Co-authored-by: Velcroboy <[email protected]>
Update hand_teleporter.yml
Co-authored-by: Velcroboy <[email protected]>
added id for captain Co-authored-by: dylanhunter <[email protected]>
Co-authored-by: PJB3005 <[email protected]>
# Conflicts: # Content.Server/Connection/ConnectionManager.cs
Upstream sync
Благодарим вас за вклад в репозиторий Space Station 14. К сожалению, похоже, что вы отправили свой PR из master-ветки. Мы предлагаем вам следовать нашей документации по использованию git Вы можете переместить текущую работу из master-ветки в другую ветку, выполнив команду |
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Описание PR
Почему / Баланс
Ссылка на ветку
Технические детали
Медиа
Критические изменения
Список изменений